merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 21 Mar 2012 07:43:58 +0000 (16:43 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 21 Mar 2012 07:43:58 +0000 (16:43 +0900)
commit6d79ee43544066fd511f925c37a90b85b6d903e8
tree51def3d309cad984047c75e92c87aa3c04180a2f
parentf038dd4fb8a322e8ebe8e5964ff3ea19529f3c53
parentb2004c92082d129227a2a600ca867832e7d51cad
merge trunk